-
Notifications
You must be signed in to change notification settings - Fork 3.9k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Deprecate two OAuth2 settings: auth_oauth2.jwks_url and management.metadata_url #12399
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
MarcialRosales
changed the title
Deprecate oauth2 settings
Deprecate(Remove+Rename) oauth2 settings
Sep 27, 2024
MarcialRosales
changed the base branch from
main
to
make-some-oauth2-settings-optional
September 27, 2024 14:13
MarcialRosales
changed the title
Deprecate(Remove+Rename) oauth2 settings
Deprecate oauth2 settings
Oct 1, 2024
MarcialRosales
force-pushed
the
deprecate-oauth2-settings
branch
from
October 2, 2024 08:12
d70d6b2
to
2586207
Compare
This was referenced Oct 2, 2024
michaelklishin
changed the title
Deprecate oauth2 settings
Deprecate two OAuth2 settings: auth_oauth2.jwks_url and management.metadata_url
Oct 4, 2024
@MarcialRosales can you please resolve the conflicts? Thank you. |
MarcialRosales
force-pushed
the
deprecate-oauth2-settings
branch
from
October 4, 2024 12:32
5ab8dd0
to
7ea48d7
Compare
MarcialRosales
force-pushed
the
make-some-oauth2-settings-optional
branch
from
October 8, 2024 06:17
0ac9e5f
to
d98eb17
Compare
MarcialRosales
force-pushed
the
deprecate-oauth2-settings
branch
from
October 8, 2024 18:23
7ea48d7
to
12134e3
Compare
@MarcialRosales the suite failures in CI seem very repeatable. |
MarcialRosales
force-pushed
the
deprecate-oauth2-settings
branch
from
October 9, 2024 14:43
7fb79ac
to
987cee6
Compare
jwks_uri takes precedence when both are set
If oauth_metadata_url is configured, RabbitMQ uses it. Else it uses the discovery_endpoint url calculated from issuer and discovery_endpoint_path
michaelklishin
force-pushed
the
deprecate-oauth2-settings
branch
from
October 9, 2024 15:01
987cee6
to
0f1b876
Compare
The forced push was a rebase on top of |
michaelklishin
approved these changes
Oct 9, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Proposed Changes
Implements these 2 features which essentially deprecate two settings:
auth_oauth2.jwks_url
and its corresponding erlang config entry #12239management.metadata_url
and move it toauth_oauth2.discovery_endpoint_path
#12237This PR adds two new settings while keeping the old ones until 4.2.x when they will be removed.
If the user configures the legacy
management.oauth_metadata_url
ormanagement.oauth_resource_server.$name.oauth_metadata_url
variables, RabbitMQ uses it. Else, the RabbitMQ uses the calculated discover endpoint url which usesissuer
anddiscovery_endpoint_path
anddiscovery_endpoint_params
.RabbitMQ will use the legacy
auth_oauth2.jwks_url
variable unlessauth_oauth2.jwks_uri
is not set.If both are set, RabbitMQ favours the new setting,
auth_oauth2.jwks_uri
.IMPORTANT NOTE: This PR depends on #12258. Once that PR is merged, this PR should be rebased and then merged.
This PR is accompanied by a docs PR rabbitmq/rabbitmq-website#2084.
Types of Changes
What types of changes does your code introduce to this project?
Put an
x
in the boxes that applyRelease note
It should be mentioned in the release notes that
auth_oauth2.jwks_url
andmanagement.oauth_metadata_url
are deprecated and in 4.2.0 they will be removed.Any reference to
auth_oauth2.jwks_url
should be renamed toauth_oauth2.jwks_uri
.Any reference in the legacy schema to
rabbitmq_auth_backend_oauth2.key_config.jwks_url
should be replaced byrabbitmq_auth_backend_oauth2.jwks_uri
.Any reference to
management.oauth_metadata_url
should be removed and instead configure theauth_oauth2.discovery_endpoint_path
accordingly. There is a section in the docs that cover this in detail. Likewise withmanagement.oauth_resource_servers.$name.oauth_metadata_url
.cc @pstack2021